range: simplify code
authorCosimo Cecchi <cosimoc@gnome.org>
Tue, 23 Feb 2016 02:28:30 +0000 (18:28 -0800)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 29 Feb 2016 18:45:12 +0000 (10:45 -0800)
Now that everything is in the main gadget, we can just let it propagate
drawing to its children.

gtk/gtkrange.c

index 3dcd634a9192a9867dd11e0a7cf804dc4e5875a7..8ed23666229c865c45a2c9ff1afe056cb9d68193 100644 (file)
@@ -2259,6 +2259,8 @@ gtk_range_render_trough (GtkCssGadget *gadget,
   if (priv->has_origin)
     gtk_css_gadget_draw (priv->highlight_gadget, cr);
 
+  gtk_css_gadget_draw (priv->slider_gadget, cr);
+
   return gtk_widget_has_visible_focus (widget);
 }
 
@@ -2269,20 +2271,7 @@ gtk_range_draw (GtkWidget *widget,
   GtkRange *range = GTK_RANGE (widget);
   GtkRangePrivate *priv = range->priv;
 
-  gtk_css_gadget_draw (priv->trough_gadget, cr);
-  gtk_css_gadget_draw (priv->slider_gadget, cr);
-
-  if (priv->stepper_a_gadget)
-    gtk_css_gadget_draw (priv->stepper_a_gadget, cr);
-
-  if (priv->stepper_b_gadget)
-    gtk_css_gadget_draw (priv->stepper_b_gadget, cr);
-
-  if (priv->stepper_c_gadget)
-    gtk_css_gadget_draw (priv->stepper_c_gadget, cr);
-
-  if (priv->stepper_d_gadget)
-    gtk_css_gadget_draw (priv->stepper_d_gadget, cr);
+  gtk_css_gadget_draw (priv->gadget, cr);
 
   return GDK_EVENT_PROPAGATE;
 }